Release 2025.2

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index e6c1e5537daa92bac7cb7ff8826cbeae62313666..db31be75e6c14d14f6e4228a05044f5e480a633b 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -175,9 +175,9 @@ endif # USE_GPGME
 symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
 
 # Uncomment this include when adding new development symbols.
-if BUILDOPT_IS_DEVEL_BUILD
-symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
-endif
+#if BUILDOPT_IS_DEVEL_BUILD
+#symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
+#endif
 
 # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
 wl_versionscript_arg = -Wl,--version-script=

diff --git a/configure.ac b/configure.ac
index 5cedc542293a3a4e30f8dddcf0452a364656f84b..f424b39a07c867efda68bb480e710ba185289c0b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([year_version], [2025])
 m4_define([release_version], [2])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index bfc1e495f843da2711fe13d08b194a6760e2810e..6640e11c78d7a370a8191ff9a97b285a29df0b8f 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -20,15 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2025.2 {
-global:
-  ostree_sepolicy_set_null_log;
-  ostree_sign_read_pk;
-  ostree_sign_read_sk;
-  ostree_blob_reader_get_type;
-  ostree_blob_reader_read_blob;
-} LIBOSTREE_2025.1;
-
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the year.  This is just a copy/paste
  * source.  Replace $LASTSTABLE with the last stable version, and $NEWVERSION

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index 8b14fecaaee9e4591230feab4aa92fdc90153cee..feaefb07441cd00d1e984a65bc86308ee7fcc9de 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -723,6 +723,15 @@ global:
   ostree_sysroot_deployment_kexec_load;
 } LIBOSTREE_2024.7;
 
+LIBOSTREE_2025.2 {
+global:
+  ostree_sepolicy_set_null_log;
+  ostree_sign_read_pk;
+  ostree_sign_read_sk;
+  ostree_blob_reader_get_type;
+  ostree_blob_reader_read_blob;
+} LIBOSTREE_2025.1;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index 43ffabe6c850366a2ece1692352a543a520d01f2..44664cb223d7ddaa110573c46c4dc5380280f59a 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-b242c2d7e73be550c21fee6ccf00509a5c1bea2d3c62095acf62cffc5f43bd64  ${released_syms}
+eea94bdacf0f6a52c15ec5586372947b3e8467f42b8d08166df3576218774725  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt